From f0cb7200632814610734a5112273bf8d70bc8cd8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Jan 2007 06:32:12 +0000 Subject: [PATCH] Fix a problem with large y thickness svn path=/trunk/; revision=17231 --- ChangeLog | 5 +++++ gtk/gtkframe.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82148d8fea..a33baa75f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-28 Matthias Clasen + + * gtk/gtkframe.c (gtk_frame_size_allocation): Fix a + problem with large y thickness. (#136592, Xan Lopez) + 2007-01-28 Matthias Clasen * gtk/gtkaction.c (gtk_action_new): Use canonical diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index bc4585d398..f5974022fc 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -640,7 +640,7 @@ gtk_frame_size_allocate (GtkWidget *widget, (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD; child_allocation.width = child_requisition.width; - child_allocation.y = frame->child_allocation.y - child_requisition.height; + child_allocation.y = frame->child_allocation.y - MAX (child_requisition.height, widget->style->ythickness); child_allocation.height = child_requisition.height; gtk_widget_size_allocate (frame->label_widget, &child_allocation); -- 2.30.2